From ddd7f2e99b17eb61b47a902bcc48fc571095fa4f Mon Sep 17 00:00:00 2001 From: Debian LibreOffice Maintainers Date: Wed, 10 Aug 2022 17:04:33 +0100 Subject: [PATCH] debian-hardened-buildflags-CPPFLAGS Gbp-Pq: Name debian-hardened-buildflags-CPPFLAGS.diff --- config_host.mk.in | 1 + configure.ac | Bin 532820 -> 532960 bytes solenv/gbuild/gbuild.mk | 2 ++ 3 files changed, 3 insertions(+) diff --git a/config_host.mk.in b/config_host.mk.in index 4d7c7336ca3..257a0380bac 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -93,6 +93,7 @@ export CPPUNIT_CFLAGS=$(gb_SPACE)@CPPUNIT_CFLAGS@ export CPPUNIT_LIBS=$(gb_SPACE)@CPPUNIT_LIBS@ export CPUNAME=@CPUNAME@ export CDEFAULTOPT=@CDEFAULTOPT@ +export HARDEN_CPPFLAGS=@HARDEN_CPPFLAGS@ export CROSS_COMPILING=@CROSS_COMPILING@ export CURL=@CURL@ export CURL_CFLAGS=$(gb_SPACE)@CURL_CFLAGS@ diff --git a/configure.ac b/configure.ac index f289f4e5eb1097e88345a8ce4745046a11b03bfe..5c97ed9d4c9434e7d5a3326c373176b051553424 100644 GIT binary patch delta 178 zcmca|Na4X@g@zW!7N!>F7M2#)Eo@nJ^_gi3C8@AFd! znK>zGIf?1T)(RyVsd-!q5a8h$F7M2#)Eo@nJ(;wEeNwo{qvuzisXTPur026NxF#rGn diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index 075c029b095..bcd22fad9e5 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -269,6 +269,8 @@ gb_GLOBALDEFS += \ DISABLE_DYNLOADING \ ) +gb_GLOBALDEFS += $(HARDEN_CPPFLAGS) + gb_GLOBALDEFS := $(sort $(gb_GLOBALDEFS)) # Common environment variables passed into all gb_*Test classes: -- 2.30.2